Add a patch to skip the test-parent test if /var/tmp doesn't support user xattrs...

diff --git a/debian/changelog b/debian/changelog
index 12f940dca60f0aa5f0ec2fa1163e5c55e3850fe8..7f16f028cdd3e465e1414193253ffc4e01c520c9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ostree (2016.5-2) experimental; urgency=medium
+
+  * Add a patch to skip the test-parent test if /var/tmp doesn't support
+    user xattrs, hopefully fixing FTBFS on x86-csail-02 buildd
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 25 Apr 2016 12:51:33 +0100
+
 ostree (2016.5-1) experimental; urgency=medium
 
   * New upstream release

diff --git a/debian/patches/series b/debian/patches/series
index bccdff5618056b2a47ef699de62a13952c083258..6fd880973a47d805ab6bc7e721def0bb47b5ee3f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 libtest-show-files-contents-when-assertions-about-them-fa.patch
+test-parent-this-test-requires-user-xattrs.patch

diff --git a/debian/patches/test-parent-this-test-requires-user-xattrs.patch b/debian/patches/test-parent-this-test-requires-user-xattrs.patch
new file mode 100644 (file)
index 0000000..825341e
--- /dev/null
+++ b/debian/patches/test-parent-this-test-requires-user-xattrs.patch
@@ -0,0 +1,22 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Mon, 25 Apr 2016 12:50:32 +0100
+Subject: test-parent: this test requires user xattrs
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ tests/test-parent.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test-parent.sh b/tests/test-parent.sh
+index 05b102a..d1f5d7c 100755
+--- a/tests/test-parent.sh
++++ b/tests/test-parent.sh
+@@ -21,6 +21,8 @@ set -euo pipefail
+ 
+ . $(dirname $0)/libtest.sh
+ 
++skip_without_user_xattrs
++
+ echo '1..2'
+ 
+ setup_test_repository "archive-z2"